merge with xen-unstable.hg

diff --cc tools/ioemu/vl.c
index 2b92cbbc7074860a47361962a08cbd125bd0fae4,b65f61d8df9c67eea103edf2a82ecc5797dc3c6e..e14e6a1d9eb3c50b6f72c442b95ad1e370fea903
--- 1/tools/ioemu/vl.c
--- 2/tools/ioemu/vl.c
+++ b/tools/ioemu/vl.c
@@@ -6448,9 -6516,24 +6520,15 @@@ int main(int argc, char **argv
  
  #elif defined(__ia64__)
  
 -    if (xc_ia64_get_pfn_list(xc_handle, domid, page_array,
 -                             IO_PAGE_START >> PAGE_SHIFT, 3) != 3) {
 -        fprintf(logfile, "xc_ia64_get_pfn_list returned error %d\n", errno);
 -        exit(-1);
 -    }
 -
+     page_array = (xen_pfn_t *)malloc(tmp_nr_pages * sizeof(xen_pfn_t));
+     if (page_array == NULL) {
+         fprintf(logfile, "malloc returned error %d\n", errno);
+         exit(-1);
+     }
+ 
      shared_page = xc_map_foreign_range(xc_handle, domid, PAGE_SIZE,
                                         PROT_READ|PROT_WRITE,
 -                                       page_array[0]);
 -
 -    fprintf(logfile, "shared page at pfn:%lx, mfn: %016lx\n",
 -            IO_PAGE_START >> PAGE_SHIFT, page_array[0]);
 +                                       IO_PAGE_START >> PAGE_SHIFT);
  
      buffered_io_page =xc_map_foreign_range(xc_handle, domid, PAGE_SIZE,
                                         PROT_READ|PROT_WRITE,

diff --cc tools/libxc/xc_linux_build.c
Simple merge

diff --cc tools/python/xen/lowlevel/xc/xc.c
index 48f85aa9dce164b6d5832a4786cc25883eaa48e0,0d68d89f28863e4fde8a89f14ba954167cf8fb12..5eafd40cb98b787b90a0521d57c2f4a505c2ce4a
--- 1/tools/python/xen/lowlevel/xc/xc.c
--- 2/tools/python/xen/lowlevel/xc/xc.c
+++ b/tools/python/xen/lowlevel/xc/xc.c
@@@ -391,14 -405,9 +408,14 @@@ static PyObject *pyxc_hvm_build(XcObjec
                                        &image, &vcpus, &pae, &acpi, &apic) )
          return NULL;
  
 +#if defined(__ia64__)
 +    /* Set vcpus to later be retrieved in setup_guest() */
 +    xc_set_hvm_param(self->xc_handle, dom, HVM_PARAM_VCPUS, vcpus);
 +#endif
      if ( xc_hvm_build(self->xc_handle, dom, memsize, image) != 0 )
-         return PyErr_SetFromErrno(xc_error);
+         return pyxc_error_to_exception();
  
 +#if !defined(__ia64__)
      /* Set up the HVM info table. */
      va_map = xc_map_foreign_range(self->xc_handle, dom, XC_PAGE_SIZE,
                                    PROT_READ | PROT_WRITE,